Made MarTrade work all the way, edited input catching