fixed minor bug and tabs