Added readme, added comments and more macros