class share added, several fixes