more work, changed some strings to keywords