Added some things and fixed a really stupid 'bug'