Some fixes, commented placeholders in some functions so it could compile to continue testing