control structures +fixes +full build