Dev justin

Small bug fixes