Overlooked a few things, more commits incoming.