added more fixes
Merge branch 'master' of https://github.com/kh901/Elements