Minor bug fixes
Added stuff, still broken