remove protected attributes + some fixes