Allocation Tracing [work in progress]

Some refactoring and [malloc == NULL] leaks clean-up