fixed small bugs and updated style