little uneffecting changes

Changed some workarrounds where i before didn't know the correct way to
use some specific routines.