update and fix few stuff