cleaned code and shit
fixed tuna bug