more fixes & slignment