Fixed some formatting issues
Bug fixes