Changed texture format and some tidying.