bug bugfix and tweaks. Also bugs can now be pulled