Various improvements and port