Added some warnings and clarifications