Added more BG hooks, fixed a few issues