Bugfixes and stuff implemented.