FINAL COMMIT, cleanup, scripts added