fixes/updates
fixes/updates
syntax updates and style changes
bugfixes and streamline