added internal references + quick fixes