(IN PROGRESS) stability improvements and stuff