Load of small but important improvements. Some comments also added