Fixed multiple bugs due to testing for first time.

Am amazed it works at all, must be a win for FOSS, suck on it
Proprieturds!!