Some updates, some cleaning