fixing some issues found through usage.