cleaned up/organized more

Cleaned up a few things, organized queued links