minor changes. TODO: get 3script working