Worked on the issues.

Please merge :)