Bug fixes, working on getting all directories working