Minor cleanups and release 0.1.3