commit some important fixes

temporary commit