Most things fixed, full capability now