clean up + new features