Hopefully fixed a couple of problems..