Fixing capitalization and overflow