Fixed bugs, enabled additonal features.