Woops, lots of changes

Forgot this was on github! Added new drawable icons for lots of stuff,
lots of misc updates. In working order