Fixed a mistake due to misunderstanding specs
Some fixes for goofiness