fixing bugs, cleaning up buttons