Fixed things! Although they're not all tested... :P