More tweaking, bugfix