Multiple additions and bugfixes