Added @throws to make*() methods, refactored unbinding code, renamed some methods