Fixed some stuff according to comments.