SinglesContainer implement, bugs fixes..