added a lot of things / tweaks