build rule simplifications, small tweaks