renames
Merge branch 'master' into rename
fix ripple out
more fixes on pop
fix number conversion number