Misc tweaks, fixed texture atlas