More bug fixes, and added Extractions