fixed bugs, refactored stuff, etc.