Clean but a few bugs