Fixed stuff. Ultimate Commit message