improved exceptions and fixed some minor bugs
removed keys