Just did a few updates to fix few sticking problems