Fixed most problems....some still remain....