HELLL
some fixes