Fixes and changes, best commit message