Fixing a few bugs.
More code style changes.