Building at start COMPLETED

RHUN
HARAD
Some minor fixes for building