Improve comments
Avoid fiddling with font sizes
Add spush and spop aliases