parse has been modified and fixed some warnings and other..