Removed lowercase support added more idiotproofing