Update credits + minor related tweaks