Bug Fixes and Style Updates