comments added
udated custom one and texture from dev branch
need to do manual merge...