fix github login
query for plans
refactor