Fixes, added readable forms of variables