Many, many tweaks