Initial Commit
Some minor changes