some fixes
Cleaned up and added properties