fixed bugs, about to mess with css