Fixed couple a nasty bugs, that's all for a while (I hope)
Added online check, better naming and stuff