Minor fixes and added self-update support