adding fitting ability
fixed bugs, added fix const functionality
fixing some stuff