Done some personal tweaks