Formatting Improvements + == Errors