new feature + fixes