highlights + fixes