Fixed a few bugs, updated some 508 stuff