bugs fixed, agregados features