A few updates and minor/ trivial bugs will be resolved.