fixed header, removed some defaults