Fixed small things, drawing added, warwick tested fixed