This patches are just some cleanups and fixes however only compile tested (my r100 got broken and the r200 isn't in a useful box right now) so testers would be great.