Minor improvements and static directory