A few improvments (I believe)