cleaned up scalars to be consistant

*split .props into release and debug versions
*some other code cleanup and refactoring