Cleanup

Updated some variables and removed some (coming soon) text