Bug fixes, added callback/filtering.