0.9a-p4

Think everything is resolved, just need testing :)