fix variables etc.