Fixed mistakes (not over yet)