corrected some linting problems
fixed some bugs
fixes some bugs