Some bugs found, hopefully ironed them out