Update, just bug fixes/minor changes mainly