styling modifications, bug fixes