+some fixes -still bad