Seems finished. Code freeze until code review/bug is found.