Commented & Fixed parser again