Fixed some important mistakes :)