Bugs fixed, smaller waves