Working on fixing some issues.