Bugfixes and more methods