fixed tabs and various other minor errors