Added more requirements and fixed current issues