Finish off subscribe
Refactor code, clean up billing section, other misc