Bugfixing. Finish.