added fixes for many things