various updates ticket requested in redmine ticket 1455