Update 0.4 & Added working CP
Minor fixes