fixed first major issue :poop: