- More debugging and logic fixes