Updates

With some unfinished major updates.