Added some code changes, started implementing help