general update
general tweaks