Fixed more bugs, added more features :)