trixie update

final from me on it. Everything should be in good working order