Cleaned the code a bit, couple of bugfixes, removed unnecessary methods...