minor fixes and beginning of the battlefield