More tweaks ... ain't a job, don't gotta write SHIT if I don't want!