Resolved various bugs, issues.