Fixed foarmating, added comments