fix bugs, change formatting