Ide 1489

Fixed all your review comments and JIRA comments.