Logger + fixes