A few bits of extra awesomeness with some bug fixes.