some little fixes and cleanup

reducing # of opts to he bare minimum. might be more to remove later :)