Added static project, small changes