Waves and slightly better GUI