tweaks, removed code, added stuff to flags