updates, cleanup & speedup