cleaning up
changed task syntax, starting to add in cl flags