Fixing refactoring bugs and adding on libs that make life bearable.