fixed bugs, made additions