Fix bug where deleting immediately after creation would fail

Also, moved the addAlbum method and event