Fixed up heaps of shit and added twitter buttons