jus some tweaks'