major updates, almost complete