more improvements
merge thingy