Fixed bugs, added features.