fixed bugs from jira list