Alot of small fixes