Working on all kinds of stuff

Nast bug around