Fixed minor bugs. Ready to be used