Adding "Aquarium" and fixing some stuff