Fixed bug in referencing and added bubbling of options overriding