esc, removed bugs