Task/improvements

See commits for further details