Stackato update
Bug fixes here and there..