Some updates and reworks/cleanups