hopefully all bugs fixed