fixed small bugs and aligments