tweaks and stuff
sprites
merged with master branch