Bugfixes and polish - MASA LIFE 1.2 release