Multiple errors fixed