Fixed build + added make run