Cleaned up code, fixed some property attributes