For the love of god, all most all bug fixed now