Bug fixing
Clean up lib folder