Spring clean + Some fixes