implement and cleanup some Rocket TODOs