Few fixes
Added waves