fixes and cleand ups