errors fixed, stable for now