aditional bugs fixes