fixed issues, cleanups