cleaned some stuff out and wrote all specs