Stuff

Fixed some misc stuff, didn't implement any new functionality (so far), sorry! :-P