Fixed buffer binds. Still seems to be somewhat buggy though.