left overs fixes