moved some stuff and added twitter callback
removed some extras