Add goodies and fixes