added more scripts, slight structure adjustments.