Renaming, finished work on callbacks, etc.