Some style tweeks and issues