added some formmatting and a fix