Bugfixes and added individual masses