Some fixes, added lines.