Still without pools, but with some bugs fixed