- updated to 5.3.0, further cleanups