Added editrc & fixes