reformat
bugfixes
Initial commit