Fixes and checks

Large bput checks