more exercises, removed some crap, changed batch to assemble everything