Fix some broke things, add greatness