Fixes and streamlined updates from develop branch

Merging of recent modifications to streamline development