some more renames
more renames
minor bug fixes, moving towards build tool