BUgs Fixed