some fixes, have an ide bug