edit work + general improvements