fixed and hacked away some issues