Build 16 | prepare for build spam - serious bug fixing