Jaq ivan

done! did some adds and formating changes