Lib changed to new coordinates and other small changes