Few more tweaks, project update (long overdue)