Fixed a bunch of stuff. Now I need to make it cleaner! (not 2. before 2.3 etc, fix the comma placement as well as the minus INFRONT instead of at the back. Grr.