[147] Updated Project to current state

Cleaning up code and fixing constructors (pParams)