fixed many minor issues and continued conversions