start to surfing wave and some bugfixes