More stability, clean up etc