Some fixes, ready to start parsing code