fixed bugs, added functionality, etc
fixed merge conflicts