Misc stuff, worked on demo