Updates to clean fork merge mess

Fixed the fork merge i think?