fixed little bits and tested ofc