More simple fixes and such.