Small bug fixes, reduced cache while in dev.