Fixed glitches, possibly added other ones, gold is still broken, sigh...