more bugs, and added some aberrations