alpha ~ 0.23

* Re-added things from before the great revert
* Changed some thing from being span quotes to custom p tags