Proj file update
Clean-up

misc changes and editor style work.