Day2 First commit.
Minor bug fixes..