bug fixes, can pass through now