Fix object sort order and add space ship lights