Fixed few errors, more to do