fixed small bugs and identation