Big improvements. Removed personnal stuff.