loader tweeks and minor updates