Formatting and more fixes
Started testing