Fixed some formatting, added stage field