beautification
other updates