Fix align
add comments
Change port setting