found more bugs still in progress to be fixed, some were fixed