alot of small fixes