Minor works and Works in progress...