last bugs fixes