alot of small changes and fixes