Revision 768

for some reason I enjoy cleaning up the code. It also includes some small bugfixes, optimizations and tweaks (not that I know how to do them), and probably new bugs...