build
more fixes, stack level too deep error remaining