Some updtates
Bug fixes