Changed names again and fixed more bugs