bugfixing. _think_ I got them all