added a lot of ERBS and worked the features