further progress on new features
merged build changes