Small bug fixes and fleshed out some conditionals