Iron out most bugs