Add more goodies (+ minor fixes)