Fixed bugs, added useability