Some updates, better formatting