fix few details
fix few things