Littles improvments

Not perfect, but it's a beginning ^^