formatting
some set/get fixes
fix the get/set stuff