Few quick fixes, Nagib'll probably sort them out better than me