Fixes and updates
Style adjust