NPEs and a few other bugs =)