Fixed various issues

works now