Tested some more functionality, added some changes for stability.