Improve celestia and makefile