Additions to 0.4.0

Cleaned up and added missing elements for 0.4.0