Startup and action context fixes !!!IMPORTANT

next is not working right without these