added some tweaks, I don't need to comment that much yet...hopefully