Waves look so good for a game, bro!! Very convincing!! About the buildings, are these prebuilt meshes or generated procedurally? If not you might give procedural generation a try. Although that would need a lot of work to build a system, it will give you more variety. :))