Fixes

Fixed most of the issues.