general cleanup

-making things more effecient
-fixed multi word properties