fixed some small inconsistency issues in code