tweaks from dreammachine!