Upgraded baseimage, cleaned up