Bugs, formatting, directory updates