Fixed few stuff