fixing initial issues