a few tweaks here and there, added a few more file layouts