Added requirements, some minor fixes