Minor Changes

Just formatting… Still many bugs.