Solving bugs

It solves some bugs/issues but keeps the same awful model..