Lots of changes again. Fix #1, Fix #3