fix'd stuff