cleanups + sequence fixes