small fixes here n there