Bugfixes
Merged bugfix and changed total $