Fixed minor bugs and added another set of features