fixed some bugs
larger pop
Merge branch 'master' into autogen