A bit more cleanup, we're not using sqlite and a non-crappy homepage.