fixed some issues from the refactoring