User errors fix'd