added a few more targets and cleaned up a bit