Fixed security leak and several other bugs things look good to go