moving working, few other minor changes