moved default key to be id instead of getId(), some tweaks and fixes
made the keys always lower case + some small fixes