bug fixes with fb support. I was tired okay ?!