Reorganized callbacks. Clean up
Updated Readme