fixed subscriptions
custom file working, not sure how useful it is though
fixed invalid login error message and tidy up CO
Merge branch 'feature/custom_file' into develop