Fixes on all problems with Thomas help