some left overs fixes