fixed parsing and more submethods