Small fixes.. seems stable enough now.