Optimized startup a bit, added line numbers