fix
fixes some bugs